Fixed a display problem in the E-mail part of the preferences page when the E-mail...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 95e9a79..18e653d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -362,6 +362,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10765) img_auth.php will now refuse logged-out requests where
   $wgWhitelistRead is undefined, instead of (incorrectly) honouring them
 * Fixed img_auth.php file name extraction for whitelist checking
+* Fixed a display problem in the E-mail part of the preferences page when
+  the E-mail is not confirmed: the notice about it was in the same line as
+  a preference.
 
 == API changes since 1.10 ==
 

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 2a88117..dc81c30 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -558,7 +558,7 @@ class PreferencesForm {
                                $skin = $wgUser->getSkin();
                                $emailauthenticated = wfMsg('emailnotauthenticated').'<br />' .
                                        $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Confirmemail' ),
-                                               wfMsg( 'emailconfirmlink' ) );
+                                               wfMsg( 'emailconfirmlink' ) ) . '<br />';
                        }
                } else {
                        $emailauthenticated = '';
@@ -566,7 +566,7 @@ class PreferencesForm {
                }
 
                if ($this->mUserEmail == '') {
-                       $emailauthenticated = wfMsg( 'noemailprefs' );
+                       $emailauthenticated = wfMsg( 'noemailprefs' ) . '<br />';
                }
 
                $ps = $this->namespacesCheckboxes();